From: Alan Mackenzie <acm@muc.de>
Date: Sun, 15 Jan 2012 19:34:11 +0000 (+0000)
Subject: Merge.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1156^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d33f3073a2864a13e5890c638c76d3e345dfd1c9;p=emacs.git

Merge.
---

d33f3073a2864a13e5890c638c76d3e345dfd1c9